From: kfraser@localhost.localdomain <kfraser@localhost.localdomain>
Date: Tue, 10 Apr 2007 19:00:45 +0000 (+0100)
Subject: linux: Fix an error path in save/restore code.
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~15252^2~20
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success/%22http:/www.example.com/cgi/success?a=commitdiff_plain;h=083ba719d99aec77d605f02fbd03350d9a4596c1;p=xen.git

linux: Fix an error path in save/restore code.
Signed-off-by: Keir Fraser <keir@xensource.com>
---

diff --git a/linux-2.6-xen-sparse/drivers/xen/core/machine_reboot.c b/linux-2.6-xen-sparse/drivers/xen/core/machine_reboot.c
index aa40702eed..13f05078eb 100644
--- a/linux-2.6-xen-sparse/drivers/xen/core/machine_reboot.c
+++ b/linux-2.6-xen-sparse/drivers/xen/core/machine_reboot.c
@@ -209,6 +209,8 @@ int __xen_suspend(int fast_suspend)
 	if (fast_suspend) {
 		xenbus_suspend();
 		err = stop_machine_run(take_machine_down, &fast_suspend, 0);
+		if (err < 0)
+			xenbus_suspend_cancel();
 	} else {
 		err = take_machine_down(&fast_suspend);
 	}